upload: add --push-options tips & doc link Change-Id: Iee38a80974c53231d1e9f04f7f85b2d0bac96dbb Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/342354 Reviewed-by: LaMont Jones <lamontjones@google.com> Tested-by: Mike Frysinger <vapier@google.com>
diff --git a/man/repo-smartsync.1 b/man/repo-smartsync.1 index 7f8c65a..8475adf 100644 --- a/man/repo-smartsync.1 +++ b/man/repo-smartsync.1
@@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH REPO "1" "July 2022" "repo smartsync" "Repo Manual" +.TH REPO "1" "August 2022" "repo smartsync" "Repo Manual" .SH NAME repo \- repo smartsync - manual page for repo smartsync .SH SYNOPSIS @@ -20,11 +20,11 @@ .TP \fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR number of network jobs to run in parallel (defaults to -\fB\-\-jobs\fR) +\fB\-\-jobs\fR or 1) .TP \fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR number of local checkout jobs to run in parallel -(defaults to \fB\-\-jobs\fR) +(defaults to \fB\-\-jobs\fR or 8) .TP \fB\-f\fR, \fB\-\-force\-broken\fR obsolete option (to be deleted in the future)
diff --git a/man/repo-sync.1 b/man/repo-sync.1 index 564f79b..9cc528d 100644 --- a/man/repo-sync.1 +++ b/man/repo-sync.1
@@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH REPO "1" "July 2022" "repo sync" "Repo Manual" +.TH REPO "1" "August 2022" "repo sync" "Repo Manual" .SH NAME repo \- repo sync - manual page for repo sync .SH SYNOPSIS @@ -20,11 +20,11 @@ .TP \fB\-\-jobs\-network\fR=\fI\,JOBS\/\fR number of network jobs to run in parallel (defaults to -\fB\-\-jobs\fR) +\fB\-\-jobs\fR or 1) .TP \fB\-\-jobs\-checkout\fR=\fI\,JOBS\/\fR number of local checkout jobs to run in parallel -(defaults to \fB\-\-jobs\fR) +(defaults to \fB\-\-jobs\fR or 8) .TP \fB\-f\fR, \fB\-\-force\-broken\fR obsolete option (to be deleted in the future)
diff --git a/man/repo-upload.1 b/man/repo-upload.1 index d7fa976..b8f6677 100644 --- a/man/repo-upload.1 +++ b/man/repo-upload.1
@@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man. -.TH REPO "1" "July 2022" "repo upload" "Repo Manual" +.TH REPO "1" "August 2022" "repo upload" "Repo Manual" .SH NAME repo \- repo upload - manual page for repo upload .SH SYNOPSIS @@ -54,6 +54,9 @@ \fB\-w\fR, \fB\-\-wip\fR upload as a work\-in\-progress change .TP +\fB\-r\fR, \fB\-\-ready\fR +mark change as ready (clears work\-in\-progress setting) +.TP \fB\-o\fR PUSH_OPTIONS, \fB\-\-push\-option\fR=\fI\,PUSH_OPTIONS\/\fR additional push options to transmit .TP @@ -66,6 +69,12 @@ \fB\-y\fR, \fB\-\-yes\fR answer yes to all safe prompts .TP +\fB\-\-ignore\-untracked\-files\fR +ignore untracked files in the working copy +.TP +\fB\-\-no\-ignore\-untracked\-files\fR +always ask about untracked files in the working copy +.TP \fB\-\-no\-cert\-checks\fR disable verifying ssl certs (unsafe) .SS Logging options: @@ -118,6 +127,12 @@ \fB\-\-reviewers\fR must already be registered with the code review system, or the upload will fail. .PP +While most normal Gerrit options have dedicated command line options, direct +access to the Gerit options is available via \fB\-\-push\-options\fR. This is useful when +Gerrit has newer functionality that repo upload doesn't yet support, or doesn't +have plans to support. See the Push Options documentation for more details: +https://gerrit\-review.googlesource.com/Documentation/user\-upload.html#push_options +.PP Configuration .PP review.URL.autoupload:
diff --git a/subcmds/upload.py b/subcmds/upload.py index 01d1dea..ac2ed14 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py
@@ -78,6 +78,13 @@ new users. Users passed as --reviewers must already be registered with the code review system, or the upload will fail. +While most normal Gerrit options have dedicated command line options, +direct access to the Gerit options is available via --push-options. +This is useful when Gerrit has newer functionality that %prog doesn't +yet support, or doesn't have plans to support. See the Push Options +documentation for more details: +https://gerrit-review.googlesource.com/Documentation/user-upload.html#push_options + # Configuration review.URL.autoupload:
